updated after various improvements and fixed links