Almost done, small bugs