More Functionality V2

error fixes