Finalizing things before master commit

Finalized some things