Added more content and squashed bugs!!!