Fixed typo.
I'm not sure if this line should exist or if there is a workaround.
Fixed some bugs that prevented other node's listings to load.
Merging non-conflict files.