Fixes and more resources added