Set cursor fixed and a bit of general cleanup