Minor bugs (forgot to change a constant back to a variable, remove a break on accident while refactoring...the normal things...)...