Minor changes, getting ready for bigger stuff