small changes + cosmetics