bug fixes related to original features