updated with updates service and few tweaks and bug fixes