Updates
Updates and cleanup