Changed filename regex, small bug fixes