Fixes #663 (closed).
Also tried to finally continue some of the work I started to do a little while ago.