Bootstrap & Micro-Refactor I

Some small fixes