Some underlying stuff, added more signals to things
More code cleaning