Removed some crack smoking errors, general code cleanup.