performance optimization an tuning
solved
minor changes