Added puts, cleaned up some stuff