more fixes, added resources