+ Implemented small tweaks