updated code, htaccess, clean up