General changes and updates (intended commit)

Due to accidental commit & sync without having proxy set, the Github
app erased current work and rolled back to earlier commit. Thankfully,
a recent backup was made.