- By Benjamin. Part of bug fixes.