updated lots of basic stuff