Fixed some of issues mentioned by Bookis