Finishing touches for initial build