small fixes and desing changes