Updated with current status and a few other tweaks