few changes - need to start doing more explained commit messages...