Revamped interface and setup fixes