Slight tweaks and filesystem revamp.