final sources - minor bug fixing