Added discussion, fixed some issues