Add option to follow mouse && minor updates