Development and tweaks