Bug fixes
Merge branch 'chen' of https://github.com/Gil401/Clubber.git into chen