Removed debugging, finished fixing.