even more changes

secondary edit, opened a new branch and everything