update #2

some cool changes listed below :P