Updated

Just some general rearranging and maintainance