some fixes + background change (need new change though)