bug fixes ect