Finished minor updates