added some ui touches, extra nosies, better logic