Finished

Just brushing up the final bugs and typos there might be.