updating with new stuff

update from jackalanmvp branch