Various bug fixes & resources renaming for easier intergration