Updated performance and added little tweaks