Bug fixes, formatting, looped running