some updates and cleanup