Allow multiple disciplines; fix spacing issues