added more attributes, training takes pretty long now but accuracy is much improved