added bill types, moved deposit to apt