fixed more functionality