Added slots
Minor tweaks