Initial Build Alpha 1.1

Quick fixes