Bug Fixes and adjustments
exe addition