Latest updates

Added a number of ad-hoc changes