updated

updated code and # comments