Few small fixes and some commenting