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