changed some difficulty settings, bug fixes, moved code around, code cleanup