Here are some updates, there is a bug in Display, Will look in to the byg later