final, cleaning up small bugs