fix problems with then and repeat, add spiral up and spiral down