fixes and resources adjustments