various fixes due to adding stuff from home/work