more code clean and bug fixes + htaccess update