updates, last for a bit till I get to updating the commenting and documentation