Some updates

Still in progress for mousecontrol