updates to previous checkin
updates to previous checkin
comments and remove dead code
fixed typo