Finished with a couple fixes