Updated and cut a lot of crap out of kite.py