Added several tweaks