Added a few more tweaks. Last stable version!