various improvements, added shortcuts to references