more bug fixes
getting very nice performance measurements now