Bug fixes, more stable