Various fixes

Updated all associated documentation and tests are here: https://github.com/eksoverzero/magickly