big update, haven't pushed in ages