Added conf file and cleanup up moar stuff