Updates regarding file extension and fixing some errors that were causing the different use cases to fail.