Cleaned code, added in quick bug fix
Cleaned code, added in quick bug fix