added Get, various fixes