staged remaining files, fixed up a bug