major update, added cursor tracking and lots more
merged