Fixed a few bugs, removed router argument from controller constructors