updates
misc
misc
working again