Bootrapping complete. Also cleaned code up.