Bugs fixed

I need to test better before, sorry.
Please pull only .htaccess or overwrite my changes.