minor changes
merge conflict resolved
partial changes to contrast handling in LGN model, not finished!