Bigger buffer, icons and fixed lots of bugs