File fine tuning added + some GUI enhancements