Initial commit
general improvements