Minor Changes

Ready for the final compile