bugs fixed, seriously