Bug fixes and cloud of darkness