Implemented a few tweaks per @guitrasher