Visual fixes, disabled tmp file creating when unnesessary, deletion of tmp