Added more methods, fixed filename bug