Fixed background, some other small fixes