some fixes, removed password