Improve stability + misc features