More optimizations and stability stuff (Yah!!)