added more hints; improved infrastructure and confirms that it works with sample solution