Some comments change and code refactoring
update dlls
Semi colon addition fix
saving to switch