fixed some moar bugs