sources update
Ooops, buggy & errors
View update