Fixed errors
Added new files