Dev

more fixes