Fixed missing comma
Small fixes and tweaks