merged with BillyDevBranch

merged with BillyDevBranch and fixed the errors in this branch, I think