Revision and tweaks