fixes for some of https://github.com/Odel/VidyaScape/issues/83, more to come