Minor changes, mainly got to the point I realized I need synapse integration.