add hints and fixes