Fix conditional complication

Get some of the main solutions working after cleanup
Basic solutions now compile

Add relevant references and minor changes to the main solutions compile
now