Points refinement implemented - bugfixes required