updates and cleanup work for stage. WP update as well.