Fixes 001

Closes various open issues.