finished reworking asserts
fixed up try/catch a bit