Buncha changes

Getting ready for final presentation