Sync issues

re pulled everything from my server to my PC to resync everything. To
many commits so little time.