Added Synapse Springs support + minor fixes