Fixed a couple of small things, made new recommendations to Kasun