fixed last details, removed todo