various changes from demo day