Added collections + misc fixes