updates, still debugging, commit to clean up files