#179, #184, #186, #187 - Fixes

http://107.170.38.195:4000/