Add a few changes

changes to make the system runable
test

test