Various Bug Fixes, New Controls And Externs