bug fixes bug fixes but still does not work :'(