minor bug + cosmetics