Fixes 002

Closes out various issues.