Solved some of Edwin's problems (hopefully)

Signed-off-by: Bert Hajee <hajee@moretIA.com>