fixing more supid bugs