- Added some asserts, a little clean-up.