fixed warning and compiling errors xD