Lots more updates and additions
Few more updates