Few more additions and style fixes