Development process

Fixed several issues