improved formatting, removed basic
moved some more stuff around