Fixed some buggs from the point restruction