Some tweaks to get things rolling; fixed some style stuff among other things.