Changed tab indentation to spaces, diamonds move at different heights, test time corrected and bug fixes.