Added sane default values
Cleaned up includes and connect method