Adds hints and fixes geometry