various fixes and tweaks to incorporate the needs of the Sofia community