Fixed small bugs, added hints