Various additions and bugfixes from GLASS methods