updates with bugs remaining
fix bugs
fix trav
fix merge