features+fixes+cleanup