Mostly comments.. But some small fixes for showing combo etc.