bugfixes and bg picker