some updates to files and conversion functions