Added resources + Misc improvements.