Bugfixes, added onion skinning