Merged changes, updated slotNames, removed some warnings