added resources, other big changes