ADDED: files and some formatting changes, minor stuff