FIxes, Changes, Improvements

Various changes, please see commits for details :)