removed pointless things, added in a few useful bits