Fixin' bugs, cleaned up code, etc., etc.