Code review and some fixes