bit of cleanup and only source blocks solidify