updated metadata, fixed bugs in main