moved some stuff
most liquid stuff fixed