some fixes, added extensions