Everything's working?
Fixed conf alignment
Massive code cleanup