somewhat working
somewhat better
changes to makefules
included overrides