Improved, better general performance and bugs fixed