various small changes
finished back-end