merge
added more stuff and fixed things