fixed some moar buuugggs