Adjusted lang slightly and added some missing methods