bug fix, v1.1 for production
resolve merge conflicts
add notes, completed coding