Small fixes and todoes