renamed resources, small code tweaks