exception use solidified
messy commit which does too much stuff. Sorry.