fixed a couple of problems with angles and times