Make it work

Some minor changes such that it works, nothing worth using yet