Increases the "fun" level of singularities (and some fixes because woo sidetracking)

Increases the "fun" level of singularities (and some fixes because woo sidetracking) #445