Code and features review

Testing and minor modifications