#21 Optimization and fixing bugs