diff --git a/out/boot.dol b/out/boot.dol
index cb6887dc..aa11fb03 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/portlibs/include/wiiuse/wiiuse.h b/portlibs/include/wiiuse/wiiuse.h
deleted file mode 100644
index 74b8dea3..00000000
--- a/portlibs/include/wiiuse/wiiuse.h
+++ /dev/null
@@ -1,747 +0,0 @@
-#ifndef __WIIUSE_H__
-#define __WIIUSE_H__
-
-#if defined(_WIN32)
-	/* windows */
-	#include <windows.h>
-#elif defined(GEKKO)
-	/* wii */
-	#include <bte/bte.h>
-#elif defined(__linux__)
-	/* nix */
-	#include <bluetooth/bluetooth.h>
-#endif
-
-#ifdef WIIUSE_INTERNAL_H_INCLUDED
-	#define WCONST
-#else
-	#define WCONST		const
-#endif
-
-/* led bit masks */
-#define WIIMOTE_LED_NONE				0x00
-#define WIIMOTE_LED_1					0x10
-#define WIIMOTE_LED_2					0x20
-#define WIIMOTE_LED_3					0x40
-#define WIIMOTE_LED_4					0x80
-
-/* button codes */
-#define WIIMOTE_BUTTON_TWO				0x0001
-#define WIIMOTE_BUTTON_ONE				0x0002
-#define WIIMOTE_BUTTON_B				0x0004
-#define WIIMOTE_BUTTON_A				0x0008
-#define WIIMOTE_BUTTON_MINUS			0x0010
-#define WIIMOTE_BUTTON_ZACCEL_BIT6		0x0020
-#define WIIMOTE_BUTTON_ZACCEL_BIT7		0x0040
-#define WIIMOTE_BUTTON_HOME				0x0080
-#define WIIMOTE_BUTTON_LEFT				0x0100
-#define WIIMOTE_BUTTON_RIGHT			0x0200
-#define WIIMOTE_BUTTON_DOWN				0x0400
-#define WIIMOTE_BUTTON_UP				0x0800
-#define WIIMOTE_BUTTON_PLUS				0x1000
-#define WIIMOTE_BUTTON_ZACCEL_BIT4		0x2000
-#define WIIMOTE_BUTTON_ZACCEL_BIT5		0x4000
-#define WIIMOTE_BUTTON_UNKNOWN			0x8000
-#define WIIMOTE_BUTTON_ALL				0x1F9F
-
-/* nunchul button codes */
-#define NUNCHUK_BUTTON_Z				0x01
-#define NUNCHUK_BUTTON_C				0x02
-#define NUNCHUK_BUTTON_ALL				0x03
-
-/* classic controller button codes */
-#define CLASSIC_CTRL_BUTTON_UP			0x0001
-#define CLASSIC_CTRL_BUTTON_LEFT		0x0002
-#define CLASSIC_CTRL_BUTTON_ZR			0x0004
-#define CLASSIC_CTRL_BUTTON_X			0x0008
-#define CLASSIC_CTRL_BUTTON_A			0x0010
-#define CLASSIC_CTRL_BUTTON_Y			0x0020
-#define CLASSIC_CTRL_BUTTON_B			0x0040
-#define CLASSIC_CTRL_BUTTON_ZL			0x0080
-#define CLASSIC_CTRL_BUTTON_FULL_R		0x0200
-#define CLASSIC_CTRL_BUTTON_PLUS		0x0400
-#define CLASSIC_CTRL_BUTTON_HOME		0x0800
-#define CLASSIC_CTRL_BUTTON_MINUS		0x1000
-#define CLASSIC_CTRL_BUTTON_FULL_L		0x2000
-#define CLASSIC_CTRL_BUTTON_DOWN		0x4000
-#define CLASSIC_CTRL_BUTTON_RIGHT		0x8000
-#define CLASSIC_CTRL_BUTTON_ALL			0xFEFF
-
-/* guitar hero 3 button codes */
-#define GUITAR_HERO_3_BUTTON_STRUM_UP	0x0001
-#define GUITAR_HERO_3_BUTTON_YELLOW		0x0008
-#define GUITAR_HERO_3_BUTTON_GREEN		0x0010
-#define GUITAR_HERO_3_BUTTON_BLUE		0x0020
-#define GUITAR_HERO_3_BUTTON_RED		0x0040
-#define GUITAR_HERO_3_BUTTON_ORANGE		0x0080
-#define GUITAR_HERO_3_BUTTON_PLUS		0x0400
-#define GUITAR_HERO_3_BUTTON_MINUS		0x1000
-#define GUITAR_HERO_3_BUTTON_STRUM_DOWN	0x4000
-#define GUITAR_HERO_3_BUTTON_ALL		0xFEFF
-
-/* guitar hero world tour touch bar codes */
-#define GUITAR_HERO_3_TOUCH_AVAILABLE	0x1000
-#define GUITAR_HERO_3_TOUCH_GREEN		0x1001
-#define GUITAR_HERO_3_TOUCH_RED			0x1002
-#define GUITAR_HERO_3_TOUCH_YELLOW		0x1004
-#define GUITAR_HERO_3_TOUCH_BLUE		0x1008
-#define GUITAR_HERO_3_TOUCH_ORANGE		0x1010
-
-/* wiimote option flags */
-#define WIIUSE_SMOOTHING				0x01
-#define WIIUSE_CONTINUOUS				0x02
-#define WIIUSE_ACCEL_THRESH				0x04
-#define WIIUSE_IR_THRESH				0x08
-#define WIIUSE_JS_THRESH				0x10
-#define WIIUSE_INIT_FLAGS				WIIUSE_SMOOTHING
-
-#define WIIUSE_ORIENT_PRECISION			100.0f
-
-/* expansion codes */
-#define EXP_NONE						0
-#define EXP_NUNCHUK						1
-#define EXP_CLASSIC						2
-#define EXP_GUITAR_HERO_3				3
-#define EXP_WII_BOARD					4
-#define EXP_MOTION_PLUS					5
-
-/* IR correction types */
-typedef enum ir_position_t {
-	WIIUSE_IR_ABOVE,
-	WIIUSE_IR_BELOW
-} ir_position_t;
-
-/**
- *	@brief Check if a button is pressed.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is pressed, 0 if not.
- */
-#define IS_PRESSED(dev, button)		((dev->btns & button) == button)
-
-/**
- *	@brief Check if a button is being held.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is held, 0 if not.
- */
-#define IS_HELD(dev, button)			((dev->btns_held & button) == button)
-
-/**
- *	@brief Check if a button is released on this event.					\n\n
- *			This does not mean the button is not pressed, it means		\n
- *			this button was just now released.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is released, 0 if not.
- *
- */
-#define IS_RELEASED(dev, button)		((dev->btns_released & button) == button)
-
-/**
- *	@brief Check if a button has just been pressed this event.
- *	@param dev		Pointer to a wiimote_t or expansion structure.
- *	@param button	The button you are interested in.
- *	@return 1 if the button is pressed, 0 if not.
- */
-#define IS_JUST_PRESSED(dev, button)	(IS_PRESSED(dev, button) && !IS_HELD(dev, button))
-
-/**
- *	@brief Return the IR sensitivity level.
- *	@param wm		Pointer to a wiimote_t structure.
- *	@param lvl		[out] Pointer to an int that will hold the level setting.
- *	If no level is set 'lvl' will be set to 0.
- */
-#define WIIUSE_GET_IR_SENSITIVITY(dev, lvl)								\
-			do {														\
-				if ((wm->state & 0x01000) == 0x01000) 		*lvl = 1;	\
-				else if ((wm->state & 0x02000) == 0x02000) 	*lvl = 2;	\
-				else if ((wm->state & 0x04000) == 0x04000) 	*lvl = 3;	\
-				else if ((wm->state & 0x08000) == 0x08000) 	*lvl = 4;	\
-				else if ((wm->state & 0x10000) == 0x10000) 	*lvl = 5;	\
-				else										*lvl = 0;	\
-			} while (0)
-
-#define WIIUSE_USING_ACC(wm)			((wm->state & 0x00100) == 0x00100)
-#define WIIUSE_USING_EXP(wm)			((wm->state & 0x00200) == 0x00200)
-#define WIIUSE_USING_IR(wm)				((wm->state & 0x00400) == 0x00400)
-#define WIIUSE_USING_SPEAKER(wm)		((wm->state & 0x00800) == 0x00800)
-
-#define WIIUSE_IS_LED_SET(wm, num)		((wm->leds & WIIMOTE_LED_##num) == WIIMOTE_LED_##num)
-
-/*
- *	Largest known payload is 21 bytes.
- *	Add 2 for the prefix and round up to a power of 2.
- */
-#define MAX_PAYLOAD			32
-
-/*
- *	This is left over from an old hack, but it may actually
- *	be a useful feature to keep so it wasn't removed.
- */
-#ifdef WIN32
-	#define WIIMOTE_DEFAULT_TIMEOUT		100
-	#define WIIMOTE_EXP_TIMEOUT			100
-#endif
-
-typedef unsigned char ubyte;
-typedef char sbyte;
-typedef unsigned short uword;
-typedef short sword;
-typedef unsigned int uint;
-typedef char sint;
-
-
-struct wiimote_t;
-struct vec3b_t;
-struct orient_t;
-struct gforce_t;
-
-#ifdef GEKKO
-	typedef void (*wii_event_cb)(struct wiimote_t*, int event);
-#endif
-
-/**
- *      @brief Callback that handles a read event.
- *
- *      @param wm               Pointer to a wiimote_t structure.
- *      @param data             Pointer to the filled data block.
- *      @param len              Length in bytes of the data block.
- *
- *      @see wiiuse_init()
- *
- *      A registered function of this type is called automatically by the wiiuse
- *      library when the wiimote has returned the full data requested by a previous
- *      call to wiiuse_read_data().
- */
-typedef void (*wiiuse_data_cb)(struct wiimote_t* wm, ubyte* data, unsigned short len);
-
-typedef enum data_req_s
-{
-	REQ_READY = 0,
-	REQ_SENT,
-	REQ_DONE
-} data_req_s;
-
-/**
- *	@struct data_req_t
- *	@brief Data read request structure.
- */
-struct data_req_t {
-	lwp_node node;
-	ubyte data[48];					/**< buffer where read data is written						*/
-	unsigned int len;
-	data_req_s state;			/**< set to 1 if not using callback and needs to be cleaned up	*/
-	wiiuse_data_cb cb;			/**< read data callback											*/
-	struct data_req_t *next;
-};
-
-typedef void (*cmd_blk_cb)(struct wiimote_t *wm,ubyte *data,uword len);
-
-typedef enum cmd_blk_s
-{
-	CMD_READY = 0,
-	CMD_SENT,
-	CMD_DONE
-} cmd_blk_s;
-
-struct cmd_blk_t 
-{
-	lwp_node node;
-
-	ubyte data[48];
-	uint len;
-
-	cmd_blk_s state;
-	cmd_blk_cb cb;
-
-	struct cmd_blk_t *next;
-};
-
-
-/**
- *	@struct vec2b_t
- *	@brief Unsigned x,y byte vector.
- */
-typedef struct vec2b_t {
-	ubyte x, y;
-} vec2b_t;
-
-
-/**
-*	@struct vec3b_t
-*	@brief Unsigned x,y,z byte vector.
-*/
-typedef struct vec3b_t {
-	ubyte x, y, z;
-} vec3b_t;
-
-/**
-*	@struct vec3b_t
-*	@brief Unsigned x,y,z byte vector.
-*/
-typedef struct vec3w_t {
-	uword x, y, z;
-} vec3w_t;
-
-
-/**
- *	@struct vec3f_t
- *	@brief Signed x,y,z float struct.
- */
-typedef struct vec3f_t {
-	float x, y, z;
-} vec3f_t;
-
-
-/**
- *	@struct orient_t
- *	@brief Orientation struct.
- *
- *	Yaw, pitch, and roll range from -180 to 180 degrees.
- */
-typedef struct orient_t {
-	float roll;						/**< roll, this may be smoothed if enabled	*/
-	float pitch;					/**< pitch, this may be smoothed if enabled	*/
-	float yaw;
-
-	float a_roll;					/**< absolute roll, unsmoothed				*/
-	float a_pitch;					/**< absolute pitch, unsmoothed				*/
-} orient_t;
-
-
-/**
- *	@struct gforce_t
- *	@brief Gravity force struct.
- */
-typedef struct gforce_t {
-	float x, y, z;
-} gforce_t;
-
-
-/**
- *	@struct accel_t
- *	@brief Accelerometer struct. For any device with an accelerometer.
- */
-typedef struct accel_t {
-	struct vec3w_t cal_zero;		/**< zero calibration					*/
-	struct vec3w_t cal_g;			/**< 1g difference around 0cal			*/
-
-	float st_roll;					/**< last smoothed roll value			*/
-	float st_pitch;					/**< last smoothed roll pitch			*/
-	float st_alpha;					/**< alpha value for smoothing [0-1]	*/
-} accel_t;
-
-
-/**
- *	@struct ir_dot_t
- *	@brief A single IR source.
- */
-typedef struct ir_dot_t {
-	ubyte visible;					/**< if the IR source is visible		*/
-
-	short rx;						/**< raw X coordinate (0-1023)			*/
-	short ry;						/**< raw Y coordinate (0-767)			*/
-
-	ubyte size;						/**< size of the IR dot (0-15)			*/
-} ir_dot_t;
-
-
-typedef struct fdot_t {
-	float x,y;
-} fdot_t;
-
-typedef struct sb_t {
-	fdot_t dots[2];
-	fdot_t acc_dots[2];
-	fdot_t rot_dots[2];
-	float angle;
-	float off_angle;
-	float score;
-} sb_t;
-
-/**
- *	@enum aspect_t
- *	@brief Screen aspect ratio.
- */
-typedef enum aspect_t {
-	WIIUSE_ASPECT_4_3,
-	WIIUSE_ASPECT_16_9
-} aspect_t;
-
-
-/**
- *	@struct ir_t
- *	@brief IR struct. Hold all data related to the IR tracking.
- */
-typedef struct ir_t {
-	struct ir_dot_t dot[4];			/**< IR dots							*/
-	ubyte num_dots;					/**< number of dots at this time		*/
-
-	int state;						/**< keeps track of the IR state		*/
-
-	int raw_valid;					/**< is the raw position valid? 		*/
-	sb_t sensorbar;					/**< sensor bar, detected or guessed	*/
-	float ax;						/**< raw X coordinate					*/
-	float ay;						/**< raw Y coordinate					*/
-	float distance;					/**< pixel width of the sensor bar		*/
-	float z;						/**< calculated distance in meters		*/
-	float angle;					/**< angle of the wiimote to the sensor bar*/
-
-	int smooth_valid;				/**< is the smoothed position valid? 	*/
-	float sx;						/**< smoothed X coordinate				*/
-	float sy;						/**< smoothed Y coordinate				*/
-	float error_cnt;				/**< error count, for smoothing algorithm*/
-	float glitch_cnt;				/**< glitch count, same					*/
-
-	int valid;						/**< is the bounded position valid? 	*/
-	float x;						/**< bounded X coordinate				*/
-	float y;						/**< bounded Y coordinate				*/
-	enum aspect_t aspect;			/**< aspect ratio of the screen			*/
-	enum ir_position_t pos;			/**< IR sensor bar position				*/
-	unsigned int vres[2];			/**< IR virtual screen resolution		*/
-	int offset[2];					/**< IR XY correction offset			*/
-
-} ir_t;
-
-
-/**
- *	@struct joystick_t
- *	@brief Joystick calibration structure.
- *
- *	The angle \a ang is relative to the positive y-axis into quadrant I
- *	and ranges from 0 to 360 degrees.  So if the joystick is held straight
- *	upwards then angle is 0 degrees.  If it is held to the right it is 90,
- *	down is 180, and left is 270.
- *
- *	The magnitude \a mag is the distance from the center to where the
- *	joystick is being held.  The magnitude ranges from 0 to 1.
- *	If the joystick is only slightly tilted from the center the magnitude
- *	will be low, but if it is closer to the outter edge the value will
- *	be higher.
- */
-typedef struct joystick_t {
-	struct vec2b_t max;				/**< maximum joystick values	*/
-	struct vec2b_t min;				/**< minimum joystick values	*/
-	struct vec2b_t center;			/**< center joystick values		*/
-	struct vec2b_t pos;				/**< raw position values        */
-
-	float ang;						/**< angle the joystick is being held		*/
-	float mag;						/**< magnitude of the joystick (range 0-1)	*/
-} joystick_t;
-
-
-/**
- *	@struct nunchuk_t
- *	@brief Nunchuk expansion device.
- */
-typedef struct nunchuk_t {
-	struct accel_t accel_calib;		/**< nunchuk accelerometer calibration		*/
-	struct joystick_t js;			/**< joystick calibration					*/
-
-	int* flags;						/**< options flag (points to wiimote_t.flags) */
-
-	ubyte btns;						/**< what buttons have just been pressed	*/
-	ubyte btns_last;				/**< what buttons have just been pressed	*/
-	ubyte btns_held;				/**< what buttons are being held down		*/
-	ubyte btns_released;			/**< what buttons were just released this	*/
-
-	struct vec3w_t accel;			/**< current raw acceleration data			*/
-	struct orient_t orient;			/**< current orientation on each axis		*/
-	struct gforce_t gforce;			/**< current gravity forces on each axis	*/
-} nunchuk_t;
-
-
-/**
- *	@struct classic_ctrl_t
- *	@brief Classic controller expansion device.
- */
-typedef struct classic_ctrl_t {
-	short btns;						/**< what buttons have just been pressed	*/
-	short btns_last;				/**< what buttons have just been pressed	*/
-	short btns_held;				/**< what buttons are being held down		*/
-	short btns_released;			/**< what buttons were just released this	*/
-
-	ubyte rs_raw;
-	ubyte ls_raw;
-
-	float r_shoulder;				/**< right shoulder button (range 0-1)		*/
-	float l_shoulder;				/**< left shoulder button (range 0-1)		*/
-
-	struct joystick_t ljs;			/**< left joystick calibration				*/
-	struct joystick_t rjs;			/**< right joystick calibration				*/
-} classic_ctrl_t;
-
-
-/**
- *	@struct guitar_hero_3_t
- *	@brief Guitar Hero 3 expansion device.
- */
-typedef struct guitar_hero_3_t {
-	short btns;						/**< what buttons have just been pressed	*/
-	short btns_last;				/**< what buttons have just been pressed	*/
-	short btns_held;				/**< what buttons are being held down		*/
-	short btns_released;			/**< what buttons were just released this	*/
-
-	ubyte wb_raw;
-	float whammy_bar;				/**< whammy bar (range 0-1)					*/
-
-	ubyte tb_raw;
-	int touch_bar;					/**< touch bar								*/
-
-	struct joystick_t js;			/**< joystick calibration					*/
-} guitar_hero_3_t;
-
-/**
-  * @struct wii_board_t
-  * @brief Wii Balance Board expansion device.
-  */
-typedef struct wii_board_t {
-	float tl;  /* Interpolated */
-	float tr;
-	float bl;
-	float br;  /* End interp */
-	short rtl; /* RAW */
-	short rtr;
-	short rbl;
-	short rbr; /* /RAW */
-	short ctl[3]; /* Calibration */
-	short ctr[3];
-	short cbl[3];
-	short cbr[3]; /* /Calibration */
-	float x;
-	float y;
-} wii_board_t;
-
-typedef struct motion_plus_t
-{
-	short rx, ry, rz;
-	ubyte status;
-	ubyte ext;
-} motion_plus_t;
-
-/**
- *	@struct expansion_t
- *	@brief Generic expansion device plugged into wiimote.
- */
-typedef struct expansion_t {
-	int type;						/**< type of expansion attached				*/
-
-	union {
-		struct nunchuk_t nunchuk;
-		struct classic_ctrl_t classic;
-		struct guitar_hero_3_t gh3;
- 		struct wii_board_t wb;
-		struct motion_plus_t mp;
-	};
-} expansion_t;
-
-
-/**
- *	@enum win32_bt_stack_t
- *	@brief	Available bluetooth stacks for Windows.
- */
-typedef enum win_bt_stack_t {
-	WIIUSE_STACK_UNKNOWN,
-	WIIUSE_STACK_MS,
-	WIIUSE_STACK_BLUESOLEIL
-} win_bt_stack_t;
-
-
-/**
- *	@struct wiimote_state_t
- *	@brief Significant data from the previous event.
- */
-typedef struct wiimote_state_t {
-	unsigned short btns;
-
-	struct ir_t ir;
-	struct vec3w_t accel;
-	struct expansion_t exp;
-} wiimote_state_t;
-
-
-/**
- *	@enum WIIUSE_EVENT_TYPE
- *	@brief Events that wiiuse can generate from a poll.
- */
-typedef enum WIIUSE_EVENT_TYPE {
-	WIIUSE_NONE = 0,
-	WIIUSE_EVENT,
-	WIIUSE_STATUS,
-	WIIUSE_CONNECT,
-	WIIUSE_DISCONNECT,
-	WIIUSE_UNEXPECTED_DISCONNECT,
-	WIIUSE_READ_DATA,
-	WIIUSE_ACK,
-	WIIUSE_NUNCHUK_INSERTED,
-	WIIUSE_NUNCHUK_REMOVED,
-	WIIUSE_CLASSIC_CTRL_INSERTED,
-	WIIUSE_CLASSIC_CTRL_REMOVED,
-	WIIUSE_GUITAR_HERO_3_CTRL_INSERTED,
- 	WIIUSE_GUITAR_HERO_3_CTRL_REMOVED,
- 	WIIUSE_WII_BOARD_INSERTED,
- 	WIIUSE_WII_BOARD_REMOVED,
- 	WIIUSE_MOTION_PLUS_ACTIVATED,
- 	WIIUSE_MOTION_PLUS_REMOVED
-} WIIUSE_EVENT_TYPE;
-
-/**
- *	@struct wiimote_t
- *	@brief Wiimote structure.
- */
-typedef struct wiimote_t {
-	WCONST int unid;						/**< user specified id						*/
-
-	#if defined(_WIN32)
-		WCONST HANDLE dev_handle;			/**< HID handle								*/
-		WCONST OVERLAPPED hid_overlap;		/**< overlap handle							*/
-		WCONST enum win_bt_stack_t stack;	/**< type of bluetooth stack to use			*/
-		WCONST int timeout;					/**< read timeout							*/
-		WCONST ubyte normal_timeout;			/**< normal timeout							*/
-		WCONST ubyte exp_timeout;			/**< timeout for expansion handshake		*/
-	#elif defined(GEKKO)
-		WCONST lwp_queue cmdq;
-		WCONST struct bd_addr bdaddr;		/**< bt address								*/
-		WCONST char bdaddr_str[18];			/**< readable bt address					*/
-		WCONST struct bte_pcb *sock;	/**< output socket							*/
-		WCONST wii_event_cb event_cb;		/**< event callback							*/
-	#elif defined(unix)
-		WCONST bdaddr_t bdaddr;				/**< bt address								*/
-		WCONST char bdaddr_str[18];			/**< readable bt address					*/
-		WCONST int out_sock;				/**< output socket							*/
-		WCONST int in_sock;					/**< input socket 							*/
-	#endif
-
-	WCONST int state;						/**< various state flags					*/
-	WCONST ubyte leds;						/**< currently lit leds						*/
-#ifdef GEKKO
-	WCONST ubyte battery_level;				/**< battery level							*/
-#else
-	WCONST float battery_level;				/**< battery level							*/
-#endif
-
-	WCONST int flags;						/**< options flag							*/
-
-	WCONST ubyte handshake_state;			/**< the state of the connection handshake	*/
-	WCONST ubyte expansion_state;			/**< the state of the expansion handshake	*/
-
-	WCONST struct data_req_t* data_req;		/**< list of data read requests				*/
-	
-	WCONST struct cmd_blk_t *cmd_head;
-	WCONST struct cmd_blk_t *cmd_tail;
-
-	WCONST struct accel_t accel_calib;		/**< wiimote accelerometer calibration		*/
-	WCONST struct expansion_t exp;			/**< wiimote expansion device				*/
-
-	WCONST struct vec3w_t accel;			/**< current raw acceleration data			*/
-	WCONST struct orient_t orient;			/**< current orientation on each axis		*/
-	WCONST struct gforce_t gforce;			/**< current gravity forces on each axis	*/
-
-	WCONST struct ir_t ir;					/**< IR data								*/
-
-	WCONST unsigned short btns;				/**< what buttons are down					*/
-	WCONST unsigned short btns_last;		/**< what buttons were down before			*/
-	WCONST unsigned short btns_held;		/**< what buttons are and were held down	*/
-	WCONST unsigned short btns_released;	/**< what buttons were just released		*/
-
-	WCONST struct wiimote_state_t lstate;	/**< last saved state						*/
-
-	WCONST WIIUSE_EVENT_TYPE event;			/**< type of event that occured				*/
-	WCONST ubyte event_buf[MAX_PAYLOAD];		/**< event buffer							*/
-
-	WCONST ubyte motion_plus_id[6];
-} wiimote;
-
-#if defined(GEKKO)
-/**
- * @struct wiimote_listen_t
- * @brief Wiimote listen structure.
- */
-typedef struct wiimote_listen_t {
-	WCONST struct bd_addr bdaddr;
-	WCONST struct bte_pcb *sock;
-	WCONST struct wiimote_t *(*assign_cb)(struct bd_addr *bdaddr);
-	WCONST struct wiimote_t *wm;
-} wiimote_listen;
-#endif
-
-/*****************************************
- *
- *	Include API specific stuff
- *
- *****************************************/
-
-#ifdef _WIN32
-	#define WIIUSE_EXPORT_DECL __declspec(dllexport)
-	#define WIIUSE_IMPORT_DECL __declspec(dllimport)
-#else
-	#define WIIUSE_EXPORT_DECL
-	#define WIIUSE_IMPORT_DECL
-#endif
-
-#ifdef WIIUSE_COMPILE_LIB
-	#define WIIUSE_EXPORT WIIUSE_EXPORT_DECL
-#else
-	#define WIIUSE_EXPORT WIIUSE_IMPORT_DECL
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* wiiuse.c */
-WIIUSE_EXPORT extern const char* wiiuse_version();
-
-#ifndef GEKKO
-WIIUSE_EXPORT extern struct wiimote_t** wiiuse_init(int wiimotes);
-#else
-WIIUSE_EXPORT extern int wiiuse_register(struct wiimote_listen_t *wml, struct bd_addr *bdaddr, struct wiimote_t *(*assign_cb)(struct bd_addr *bdaddr));
-WIIUSE_EXPORT extern struct wiimote_t** wiiuse_init(int wiimotes, wii_event_cb event_cb);
-WIIUSE_EXPORT extern void wiiuse_sensorbar_enable(int enable);
-#endif
-
-WIIUSE_EXPORT extern void wiiuse_disconnected(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_cleanup(struct wiimote_t** wm, int wiimotes);
-WIIUSE_EXPORT extern void wiiuse_rumble(struct wiimote_t* wm, int status);
-WIIUSE_EXPORT extern void wiiuse_toggle_rumble(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_set_leds(struct wiimote_t* wm, int leds,cmd_blk_cb cb);
-WIIUSE_EXPORT extern void wiiuse_motion_sensing(struct wiimote_t* wm, int status);
-WIIUSE_EXPORT extern int wiiuse_read_data(struct wiimote_t* wm, ubyte* buffer, unsigned int offset, unsigned short len, cmd_blk_cb cb);
-WIIUSE_EXPORT extern int wiiuse_write_data(struct wiimote_t *wm,unsigned int addr,ubyte *data,ubyte len,cmd_blk_cb cb);
-WIIUSE_EXPORT extern void wiiuse_status(struct wiimote_t *wm,cmd_blk_cb cb);
-WIIUSE_EXPORT extern struct wiimote_t* wiiuse_get_by_id(struct wiimote_t** wm, int wiimotes, int unid);
-WIIUSE_EXPORT extern int wiiuse_set_flags(struct wiimote_t* wm, int enable, int disable);
-WIIUSE_EXPORT extern float wiiuse_set_smooth_alpha(struct wiimote_t* wm, float alpha);
-WIIUSE_EXPORT extern void wiiuse_set_bluetooth_stack(struct wiimote_t** wm, int wiimotes, enum win_bt_stack_t type);
-WIIUSE_EXPORT extern void wiiuse_resync(struct wiimote_t* wm);
-WIIUSE_EXPORT extern void wiiuse_set_timeout(struct wiimote_t** wm, int wiimotes, ubyte normal_timeout, ubyte exp_timeout);
-WIIUSE_EXPORT extern int wiiuse_write_streamdata(struct wiimote_t *wm,ubyte *data,ubyte len,cmd_blk_cb cb);
-
-/* connect.c */
-WIIUSE_EXPORT extern int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout);
-WIIUSE_EXPORT extern int wiiuse_connect(struct wiimote_t** wm, int wiimotes);
-WIIUSE_EXPORT extern void wiiuse_disconnect(struct wiimote_t* wm);
-
-/* events.c */
-WIIUSE_EXPORT extern int wiiuse_poll(struct wiimote_t** wm, int wiimotes);
-
-/* ir.c */
-WIIUSE_EXPORT extern void wiiuse_set_ir_mode(struct wiimote_t *wm);
-WIIUSE_EXPORT extern void wiiuse_set_ir(struct wiimote_t* wm, int status);
-WIIUSE_EXPORT extern void wiiuse_set_ir_vres(struct wiimote_t* wm, unsigned int x, unsigned int y);
-WIIUSE_EXPORT extern void wiiuse_set_ir_position(struct wiimote_t* wm, enum ir_position_t pos);
-WIIUSE_EXPORT extern void wiiuse_set_aspect_ratio(struct wiimote_t* wm, enum aspect_t aspect);
-WIIUSE_EXPORT extern void wiiuse_set_ir_sensitivity(struct wiimote_t* wm, int level);
-
-/* motion_plus.c */
-WIIUSE_EXPORT extern void wiiuse_set_motion_plus(struct wiimote_t *wm, int status);
-
-/* speaker.c */
-WIIUSE_EXPORT extern void wiiuse_set_speaker(struct wiimote_t *wm, int status);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/portlibs/include/wiiuse/wpad.h b/portlibs/include/wiiuse/wpad.h
deleted file mode 100644
index 27e5217c..00000000
--- a/portlibs/include/wiiuse/wpad.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-------------------------------------------------------------
-
-wpad.h -- Wiimote Application Programmers Interface
-
-Copyright (C) 2008
-Michael Wiedenbauer (shagkur)
-Dave Murphy (WinterMute)
-Hector Martin (marcan)
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1.	The origin of this software must not be misrepresented; you
-must not claim that you wrote the original software. If you use
-this software in a product, an acknowledgment in the product
-documentation would be appreciated but is not required.
-
-2.	Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3.	This notice may not be removed or altered from any source
-distribution.
-
--------------------------------------------------------------*/
-
-#ifndef __WPAD_H__
-#define __WPAD_H__
-
-#include <gctypes.h>
-#include "wiiuse/wiiuse.h"
-
-#define WPAD_MAX_IR_DOTS						4
-											
-enum {
-	WPAD_CHAN_ALL = -1,
-	WPAD_CHAN_0,
-	WPAD_CHAN_1,
-	WPAD_CHAN_2,
-	WPAD_CHAN_3,
-	WPAD_BALANCE_BOARD,
-	WPAD_MAX_WIIMOTES,
-};
-											
-#define WPAD_BUTTON_2							0x0001
-#define WPAD_BUTTON_1							0x0002
-#define WPAD_BUTTON_B							0x0004
-#define WPAD_BUTTON_A							0x0008
-#define WPAD_BUTTON_MINUS						0x0010
-#define WPAD_BUTTON_HOME						0x0080
-#define WPAD_BUTTON_LEFT						0x0100
-#define WPAD_BUTTON_RIGHT						0x0200
-#define WPAD_BUTTON_DOWN						0x0400
-#define WPAD_BUTTON_UP							0x0800
-#define WPAD_BUTTON_PLUS						0x1000
-											
-#define WPAD_NUNCHUK_BUTTON_Z					(0x0001<<16)
-#define WPAD_NUNCHUK_BUTTON_C					(0x0002<<16)
-											
-#define WPAD_CLASSIC_BUTTON_UP					(0x0001<<16)
-#define WPAD_CLASSIC_BUTTON_LEFT				(0x0002<<16)
-#define WPAD_CLASSIC_BUTTON_ZR					(0x0004<<16)
-#define WPAD_CLASSIC_BUTTON_X					(0x0008<<16)
-#define WPAD_CLASSIC_BUTTON_A					(0x0010<<16)
-#define WPAD_CLASSIC_BUTTON_Y					(0x0020<<16)
-#define WPAD_CLASSIC_BUTTON_B					(0x0040<<16)
-#define WPAD_CLASSIC_BUTTON_ZL					(0x0080<<16)
-#define WPAD_CLASSIC_BUTTON_FULL_R				(0x0200<<16)
-#define WPAD_CLASSIC_BUTTON_PLUS				(0x0400<<16)
-#define WPAD_CLASSIC_BUTTON_HOME				(0x0800<<16)
-#define WPAD_CLASSIC_BUTTON_MINUS				(0x1000<<16)
-#define WPAD_CLASSIC_BUTTON_FULL_L				(0x2000<<16)
-#define WPAD_CLASSIC_BUTTON_DOWN				(0x4000<<16)
-#define WPAD_CLASSIC_BUTTON_RIGHT				(0x8000<<16)
-
-#define WPAD_GUITAR_HERO_3_BUTTON_STRUM_UP		(0x0001<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_YELLOW		(0x0008<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_GREEN			(0x0010<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_BLUE			(0x0020<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_RED			(0x0040<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_ORANGE		(0x0080<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_PLUS			(0x0400<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_MINUS			(0x1000<<16)
-#define WPAD_GUITAR_HERO_3_BUTTON_STRUM_DOWN	(0x4000<<16)
-
-enum {
-	WPAD_EXP_NONE = 0,
-	WPAD_EXP_NUNCHUK,
-	WPAD_EXP_CLASSIC,
-	WPAD_EXP_GUITARHERO3,
- 	WPAD_EXP_WIIBOARD,
-	WPAD_EXP_UNKNOWN = 255
-};
-
-enum {
-	WPAD_FMT_BTNS = 0,
-	WPAD_FMT_BTNS_ACC,
-	WPAD_FMT_BTNS_ACC_IR
-};
-
-enum {
-	WPAD_STATE_DISABLED,
-	WPAD_STATE_ENABLING,
-	WPAD_STATE_ENABLED
-};
-
-#define WPAD_ERR_NONE							0
-#define WPAD_ERR_NO_CONTROLLER					-1
-#define WPAD_ERR_NOT_READY						-2
-#define WPAD_ERR_TRANSFER						-3
-#define WPAD_ERR_NONEREGISTERED					-4
-#define WPAD_ERR_UNKNOWN						-5
-#define WPAD_ERR_BAD_CHANNEL					-6
-#define WPAD_ERR_QUEUE_EMPTY					-7
-#define WPAD_ERR_BADVALUE						-8
-#define WPAD_ERR_BADCONF                        -9
-
-#define WPAD_DATA_BUTTONS						0x01
-#define WPAD_DATA_ACCEL							0x02
-#define WPAD_DATA_EXPANSION						0x04
-#define WPAD_DATA_IR							0x08
-
-#define WPAD_ENC_FIRST							0x00
-#define WPAD_ENC_CONT							0x01
-
-#define WPAD_THRESH_IGNORE						-1
-#define WPAD_THRESH_ANY							0
-#define WPAD_THRESH_DEFAULT_BUTTONS				0
-#define WPAD_THRESH_DEFAULT_IR					WPAD_THRESH_IGNORE
-#define WPAD_THRESH_DEFAULT_ACCEL				20
-#define WPAD_THRESH_DEFAULT_JOYSTICK			2
-#define WPAD_THRESH_DEFAULT_BALANCEBOARD		60
-#define WPAD_THRESH_DEFAULT_MOTION_PLUS			100
-
-#ifdef __cplusplus
-   extern "C" {
-#endif /* __cplusplus */
-
-typedef struct _wpad_data
-{
-	s16 err;
-
-	u32 data_present;
-	u8 battery_level;
-
-	u32 btns_h;
-	u32 btns_l;
-	u32 btns_d;
-	u32 btns_u;
-
-	struct ir_t ir;
-	struct vec3w_t accel;
-	struct orient_t orient;
-	struct gforce_t gforce;
-	struct expansion_t exp;
-} WPADData;
-
-typedef struct _wpad_encstatus
-{
-	u8 data[32];
-}WPADEncStatus;
-
-typedef void (*WPADDataCallback)(s32 chan, const WPADData *data);
-typedef void (*WPADShutdownCallback)(s32 chan);
-
-s32 WPAD_Init();
-s32 WPAD_ControlSpeaker(s32 chan,s32 enable);
-s32 WPAD_ReadEvent(s32 chan, WPADData *data);
-s32 WPAD_DroppedEvents(s32 chan);
-s32 WPAD_Flush(s32 chan);
-s32 WPAD_ReadPending(s32 chan, WPADDataCallback datacb);
-s32 WPAD_SetDataFormat(s32 chan, s32 fmt);
-s32 WPAD_SetMotionPlus(s32 chan, u8 enable);
-s32 WPAD_SetVRes(s32 chan,u32 xres,u32 yres);
-s32 WPAD_GetStatus();
-s32 WPAD_Probe(s32 chan,u32 *type);
-s32 WPAD_SetEventBufs(s32 chan, WPADData *bufs, u32 cnt);
-s32 WPAD_Disconnect(s32 chan);
-s32 WPAD_IsSpeakerEnabled(s32 chan);
-s32 WPAD_SendStreamData(s32 chan,void *buf,u32 len);
-void WPAD_Shutdown();
-void WPAD_SetIdleTimeout(u32 seconds);
-void WPAD_SetPowerButtonCallback(WPADShutdownCallback cb);
-void WPAD_SetBatteryDeadCallback(WPADShutdownCallback cb);
-s32 WPAD_ScanPads();
-s32 WPAD_Rumble(s32 chan, int status);
-s32 WPAD_SetIdleThresholds(s32 chan, s32 btns, s32 ir, s32 accel, s32 js, s32 wb, s32 mp);
-void WPAD_EncodeData(WPADEncStatus *info,u32 flag,const s16 *pcmSamples,s32 numSamples,u8 *encData);
-WPADData *WPAD_Data(int chan);
-u8 WPAD_BatteryLevel(int chan);
-u32 WPAD_ButtonsUp(int chan);
-u32 WPAD_ButtonsDown(int chan);
-u32 WPAD_ButtonsHeld(int chan);
-void WPAD_IR(int chan, struct ir_t *ir);
-void WPAD_Orientation(int chan, struct orient_t *orient);
-void WPAD_GForce(int chan, struct gforce_t *gforce);
-void WPAD_Accel(int chan, struct vec3w_t *accel);
-void WPAD_Expansion(int chan, struct expansion_t *exp);
-
-#ifdef __cplusplus
-   }
-#endif /* __cplusplus */
-
-#endif
diff --git a/portlibs/lib/libwiiuse.a b/portlibs/lib/libwiiuse.a
deleted file mode 100644
index 69d75863..00000000
Binary files a/portlibs/lib/libwiiuse.a and /dev/null differ
diff --git a/source/btnmap.h b/source/btnmap.h
index 5b4e116e..77845ec3 100644
--- a/source/btnmap.h
+++ b/source/btnmap.h
@@ -1,4 +1,5 @@
 
+/* button presses for wiimote && classic controller && nunchuck Z button, also wiiu pro as expansion classic controller */
 #define WBTN_UP_PRESSED (wBtn_Pressed(WPAD_BUTTON_UP, WPAD_EXP_NONE) \
 		|| wBtn_Pressed(WPAD_CLASSIC_BUTTON_UP, WPAD_EXP_CLASSIC))
 #define WBTN_DOWN_PRESSED (wBtn_Pressed(WPAD_BUTTON_DOWN, WPAD_EXP_NONE) \
@@ -47,7 +48,7 @@
 #define WBTN_2_HELD (wBtn_Held(WPAD_BUTTON_2, WPAD_EXP_NONE) \
 		|| wBtn_Held(WPAD_CLASSIC_BUTTON_X, WPAD_EXP_CLASSIC))
 
-/* gamecube controller */
+/* button presses for gamecube controller && DS3 && WiiDRC */
 #define GBTN_UP (PAD_BUTTON_UP)
 #define GBTN_DOWN (PAD_BUTTON_DOWN)
 #define GBTN_LEFT (PAD_BUTTON_LEFT)
@@ -86,7 +87,7 @@
 #define GBTN_1_HELD (gc_btnsHeld & GBTN_1)
 #define GBTN_2_HELD (gc_btnsHeld & GBTN_2)
 
-/* All controllers */
+/* All controllers (wii & gc combined ) */
 #define BTN_UP_PRESSED (WBTN_UP_PRESSED || GBTN_UP_PRESSED)
 #define BTN_DOWN_PRESSED (WBTN_DOWN_PRESSED || GBTN_DOWN_PRESSED)
 #define BTN_LEFT_PRESSED (WBTN_LEFT_PRESSED || GBTN_LEFT_PRESSED)
@@ -126,6 +127,9 @@ enum
 #define BTN_RIGHT_REPEAT (wii_btnRepeat(WBTN_RIGHT) || gc_btnRepeat(GBTN_RIGHT))
 #define BTN_A_REPEAT (wii_btnRepeat(WBTN_A) || gc_btnRepeat(GBTN_A))
 
+/* joysticks */
+/* left stick = cc left stick && GH3, right stick = cc right stick && nunchuck stick */
+/* ds3, wiidrc, and wiiu pro use their own stick values */ 
 #define LEFT_STICK_UP lStick_Up()
 #define LEFT_STICK_DOWN lStick_Down()
 #define LEFT_STICK_LEFT lStick_Left()
@@ -140,15 +144,15 @@ enum
 #define WROLL_LEFT  wRoll_Left()
 #define WROLL_RIGHT wRoll_Right()
 
-/* Internal */
-#define LEFT_STICK_ANG_UP ((left_stick_angle[chan] >= 300 && left_stick_angle[chan] <= 360) \
-		|| (left_stick_angle[chan] >= 0 && left_stick_angle[chan] <= 60))
+/* convert stick angles to be used by l or r Stick_direction() above */
+#define LEFT_STICK_ANG_UP (left_stick_angle[chan] >= -60 && left_stick_angle[chan] <= 60)
 #define LEFT_STICK_ANG_RIGHT (left_stick_angle[chan] >= 30 && left_stick_angle[chan] <= 150)
-#define LEFT_STICK_ANG_DOWN (left_stick_angle[chan] >= 120 && left_stick_angle[chan] <= 240)
-#define LEFT_STICK_ANG_LEFT (left_stick_angle[chan] >= 210 && left_stick_angle[chan] <= 330)
+#define LEFT_STICK_ANG_DOWN ((left_stick_angle[chan] >= 120 && left_stick_angle[chan] <= 180) \
+		|| (left_stick_angle[chan] >= -180 && left_stick_angle[chan] <= -120))
+#define LEFT_STICK_ANG_LEFT (left_stick_angle[chan] >= -150 && left_stick_angle[chan] <= -30)
 
-#define RIGHT_STICK_ANG_UP ((right_stick_angle[chan] >= 300 && right_stick_angle[chan] <= 360) \
-		|| (right_stick_angle[chan] >= 0 && right_stick_angle[chan] <= 60))
+#define RIGHT_STICK_ANG_UP (right_stick_angle[chan] >= -60 && right_stick_angle[chan] <= 60)
 #define RIGHT_STICK_ANG_RIGHT (right_stick_angle[chan] >= 30 && right_stick_angle[chan] <= 150)
-#define RIGHT_STICK_ANG_DOWN (right_stick_angle[chan] >= 120 && right_stick_angle[chan] <= 240)
-#define RIGHT_STICK_ANG_LEFT (right_stick_angle[chan] >= 210 && right_stick_angle[chan] <= 330)
+#define RIGHT_STICK_ANG_DOWN ((right_stick_angle[chan] >= 120 && right_stick_angle[chan] <= 180) \
+		|| (right_stick_angle[chan] >= -180 && right_stick_angle[chan] <= -120))
+#define RIGHT_STICK_ANG_LEFT (right_stick_angle[chan] >= -150 && right_stick_angle[chan] <= -30)