Update DESCRIPTION and fix bugs