added point support, bugfixes