Dev

fixing errors