upped stability and some other fixes