more updates, currently problem with features <> states
add all other files