starting to fix compile bugs..