Bugfixes, added fanciness