Devel

Fixes a lot of the critic tests and improves formatting