moar cleaning

and some bug fixing ofc :3