some improvments, added the rest of the files