make jar run standalone
merge code