added password, moved stuff around