Final changes

Some final changes + updates to some code