Feature/background bugs

This should definitely fix #26