Commit again
Another pass at improvements