Added different bugs