More bug fixes and expanding the features