Updates and cleanup, run scripts out of bin/ now