Small fixes with title and stuff