Fixed marker-panel not clearing

Also added a few functions for calculating score