minor bugfixes & styling & format money