bug fix, v1.1 for production
resolve conflict
added notes, completed coding