Added forms and fixed rotation bug