fixed Makefile don't contain decoder, fixed decoder so it works with new feature set