BUGFIX: fixed multiple silly bugs