some updates
misc and more