Cleanup + enum + help change + more logic