bugfixes, merged changes from broken milliticks meta magic commit