AdditionalPoints works with new logic

Also bug with more lines resolved