prototype ready
fixed some issues plus release