Some updates.. Still in --alpha version