Fixed many things, added more to future work