Several improvements and additions

See #11