big commit, not sure all what's here, just trying to get back on bandwagon
merging random bs to my working branch