Fixed a few \"bugs\", see author notes.
(This was meant to be something quick, yet it ended up so \"big\" hehe)