- By Benjamin. Fixed bugs.