Preparing alpha version

Some updates and fixes before the first alpha version