Updated with first run, some bug fixes.