Some more performance tweaks and starting listener automatically