fixed exception assert
cleaned up some stuff