Updated many sunspot functions
Deleted some unnecessary stuff