Bug fixes, more stability
Fixed