few changes and updates