Fixed parameter display
Added bonus points, fixed a lot of stuff