various fixes and features

Done some shit.