cleaned up some files, got more album feature specs passing
fixed some more feature specs