temp visual stuff
fix a few bugs