fixes and maintanance