screen adjusts
deleted useless maps
commented old tests