minor fixings still needs fixings