more CS fixes and TypeHinting missing