Resolved the known issues and finished most of the pending work