Fixing a few things, adding basic features