Small bugfixes, AreaPoint added