With initial type library and bug fixes