Cleanup/bug fixes, getting close to stable