Updated source-code. Everything working and indented.