Latest updates and tweaks 6/2/13