Got some more features and tweaks in