Fixed some issues and added a few enhancement..