various mods

fixing my branch ;/