Fixed build error
Added plaintable pkg
Fixed broken package build
Fixed whitespace issues