Remove inefficiencies from post proc (like is_dir everywhere..) still more to change..