Finished up with changes/fixes