fix guardfile for new format, small amendments