few bugs fixed, see how we go