Dev

some minor fixes