Shorter function names and a few bugfixes