cosmetic changes + bug fixx