fixed sone stuff