Few fixes and some new connectors and things