Done for the night. Made a few fixes