small fixes and cleaner repo