Closed #183. Closed #184. Minor changes