Minor Fixes

Alpha 0.1 Review