Last commit, final changes/additions