bug-fixes: fixed bugs with not requring the right things...