More updates, mostly click/move related