1. Minor tweaks to fs (logging and code style)