xero/glitchlock 8 commits

xero/startpage 2 commits