small changes, everything in package main