Small fixes and better R table