First Round bug fixes, WIP