lots of tweaks
Get rid of increment to find index, other tweaks

Conflicts:
	KeplerParser/KeplerParser.java