Added mising stuff and fixes...