Just some ideas and tweaks