Fixed various timelord bugs
Merge cleaup