more bug fixes ughh