Configuration improvements
Updated Guardfile
Added todo items