Various Changes. Too many to list :P