Minor feature and bug fixes

Comments for each fix is provided / commit