Made changes necessary for building and releasingl