Local list of modifications, cleanup, gitignore fixes