Implemented features and performed bug fixes