Adds multiple object supports
Improves a bit the gui