Cleaned stuff up
Changes, strange bug
Progress
Progress, new/old bugs