stuff and bug fixes