bug fixes and minor improvements
Merge branch 'iraklis_dev'