removed "extended" library and fixed some build issues