Minor fixes, please review :)