Misc Update

See title and code