misc
updated
mostly finished