Updates and bugfixes

updated lots of little bugs/niceties, nothing significant