changes to multiple files to fix brian's mess :)