Final commits

Hopefully with no new bugs