Fixed

• Minor bug fixes and stability improvements