fixed stuff :)