test tweaks and some kwalitee apeasment