Small changes, fixed note headers for files and negligible other fixes